Merge pull request #240 from squarel/master
change chef site-cookbook
Andrew Cantino
променени са 2 файла, в които са добавени 8 реда и са изтрити 8 реда
+ 4
- 4
deployment/site-cookbooks/huginn_development/recipes/default.rb
@@ -16,7 +16,7 @@ group "huginn" do |
||
| 16 | 16 |
action :create |
| 17 | 17 |
end |
| 18 | 18 |
|
| 19 |
-%w("ruby1.9.1" "ruby1.9.1-dev" "libxslt-dev" "libxml2-dev" "curl").each do |pkg|
|
|
| 19 |
+%w("ruby1.9.1" "ruby1.9.1-dev" "libxslt-dev" "libxml2-dev" "curl" "libmysqlclient-dev").each do |pkg|
|
|
| 20 | 20 |
package pkg do |
| 21 | 21 |
action :install |
| 22 | 22 |
end |
@@ -49,9 +49,9 @@ bash "huginn dependencies" do |
||
| 49 | 49 |
export LC_ALL="en_US.UTF-8" |
| 50 | 50 |
sudo bundle install |
| 51 | 51 |
sed s/REPLACE_ME_NOW\!/$(sudo rake secret)/ .env.example > .env |
| 52 |
- sudo rake db:create |
|
| 53 |
- sudo rake db:migrate |
|
| 54 |
- sudo rake db:seed |
|
| 52 |
+ sudo bundle exec rake db:create |
|
| 53 |
+ sudo bundle exec rake db:migrate |
|
| 54 |
+ sudo bundle exec rake db:seed |
|
| 55 | 55 |
EOH |
| 56 | 56 |
end |
| 57 | 57 |
|
+ 4
- 4
deployment/site-cookbooks/huginn_production/recipes/default.rb
@@ -14,7 +14,7 @@ group "huginn" do |
||
| 14 | 14 |
members ["huginn"] |
| 15 | 15 |
end |
| 16 | 16 |
|
| 17 |
-%w("ruby1.9.1" "ruby1.9.1-dev" "libxslt-dev" "libxml2-dev" "curl" "libshadow-ruby1.8").each do |pkg|
|
|
| 17 |
+%w("ruby1.9.1" "ruby1.9.1-dev" "libxslt-dev" "libxml2-dev" "curl" "libshadow-ruby1.8" "libmysqlclient-dev").each do |pkg|
|
|
| 18 | 18 |
package("#{pkg}")
|
| 19 | 19 |
end |
| 20 | 20 |
|
@@ -84,9 +84,9 @@ deploy "/home/huginn" do |
||
| 84 | 84 |
sudo cp /home/huginn/shared/config/nginx.conf /etc/nginx/ |
| 85 | 85 |
sudo bundle install |
| 86 | 86 |
sed -i s/REPLACE_ME_NOW\!/$(sudo rake secret)/ .env |
| 87 |
- sudo rake db:create |
|
| 88 |
- sudo rake db:migrate |
|
| 89 |
- sudo rake db:seed |
|
| 87 |
+ sudo bundle exec rake db:create |
|
| 88 |
+ sudo bundle exec rake db:migrate |
|
| 89 |
+ sudo bundle exec rake db:seed |
|
| 90 | 90 |
sudo foreman export upstart /etc/init -a huginn -u huginn -l log |
| 91 | 91 |
sudo start huginn |
| 92 | 92 |
EOH |